Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jstzd: add rollup build script and spawn rollup in jstzd #670

Merged
merged 3 commits into from
Dec 4, 2024

Conversation

ryutamago
Copy link
Collaborator

@ryutamago ryutamago commented Nov 17, 2024

Context

spawn rollup in jstzd

NOTE:
The jstz kernel rollup seems to not process the block in the CI (i suppose some issue with nix.flake)
the test works fine with the default nix settings nix flake check.
I also replaced the jstz kernel with the toy rollup kernel and that worked with the nix.flake

Description

There are two parts in this PR:

  1. add a build script to build the rollup preimages / installer
    a. Modified the MakeFile so that the kernel.wasm is copied to crates/jstzd/
    b. Add build.rs that 1) stores the rollup kernel_installer.hex, preimages/ and parameters_ty.json to OUT_DIR. 2) generate a path getter file (jstz_rollup_path.rs) to access the path of 1
  2. add rollup to the jstzd server

Manually testing the PR

added rollup to the jstzd integration test.

make build
cargo test --package jstzd --test jstzd_test
nix flake check  

@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 9092c37 to 24607d3 Compare November 17, 2024 19:08
@zcabter zcabter self-assigned this Nov 18, 2024
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 24607d3 to 0418f5f Compare November 21, 2024 10:53
@ryutamago ryutamago changed the title [WIP] build rollup preimages and spawn rollup Jstzd: add build.rs fro the rollup and spawn rollup in jstzd Nov 21, 2024
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 0418f5f to a88546d Compare November 21, 2024 11:24
@ryutamago ryutamago assigned ryutamago and unassigned zcabter Nov 21, 2024
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 45250c5 to ffc7da6 Compare November 21, 2024 11:56
crates/jstzd/src/task/jstzd.rs Outdated Show resolved Hide resolved
crates/jstzd/src/task/jstzd.rs Outdated Show resolved Hide resolved
insatller Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@zcabter
Copy link
Collaborator

zcabter commented Nov 21, 2024

Btw, you should add ./resources/jstz_rollup and jstz_rollup_path.rs to the .gitignore and include these files as part of the jstzd package in Cargo.toml

@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from ffc7da6 to 3b81952 Compare November 21, 2024 15:13
Copy link

codecov bot commented Nov 21, 2024

Codecov Report

Attention: Patch coverage is 79.71014% with 14 lines in your changes missing coverage. Please review.

Project coverage is 47.89%. Comparing base (5647e1c) to head (8e7f0c0).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
crates/jstzd/src/task/jstzd.rs 79.06% 1 Missing and 8 partials ⚠️
crates/jstzd/src/task/utils.rs 72.72% 0 Missing and 3 partials ⚠️
crates/octez/src/async/rollup.rs 0.00% 2 Missing ⚠️
Files with missing lines Coverage Δ
crates/jstzd/src/config.rs 96.79% <100.00%> (+0.09%) ⬆️
crates/jstzd/src/lib.rs 83.33% <ø> (-8.34%) ⬇️
crates/octez/src/async/rollup.rs 95.00% <0.00%> (+5.75%) ⬆️
crates/jstzd/src/task/utils.rs 89.62% <72.72%> (-1.96%) ⬇️
crates/jstzd/src/task/jstzd.rs 76.05% <79.06%> (+0.13%) ⬆️

... and 5 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5647e1c...8e7f0c0. Read the comment docs.

@ryutamago ryutamago marked this pull request as ready for review November 22, 2024 13:02
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from a56cbbf to 8165914 Compare November 22, 2024 13:14
@ryutamago ryutamago assigned zcabter and unassigned ryutamago Nov 22, 2024
@zcabter zcabter force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 8165914 to f6656f0 Compare November 22, 2024 14:20
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch 4 times, most recently from 98ac9dd to 7a37ece Compare November 25, 2024 11:59
@ryutamago ryutamago changed the title Jstzd: add build.rs fro the rollup and spawn rollup in jstzd Jstzd: add rollup build script and spawn rollup in jstzd Nov 25, 2024
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch 2 times, most recently from 0dc68a8 to 3933223 Compare November 29, 2024 13:32
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from b55c674 to 9cf370b Compare December 3, 2024 14:59
crates/jstzd/build.rs Outdated Show resolved Hide resolved
file_path Outdated Show resolved Hide resolved
crates/jstzd/src/config.rs Outdated Show resolved Hide resolved
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from a5e292c to 1259764 Compare December 3, 2024 15:30
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 1259764 to be30fda Compare December 3, 2024 15:48
@ryutamago ryutamago force-pushed the leounoki-jstz-164/spawn-rollup-3 branch from 7e1bb8d to 8e7f0c0 Compare December 3, 2024 17:17
@ryutamago ryutamago merged commit a013349 into main Dec 4, 2024
5 checks passed
@ryutamago ryutamago deleted the leounoki-jstz-164/spawn-rollup-3 branch December 4, 2024 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants